bitkeeper revision 1.1645 (429f63fb6JW1K1LYjnjnswN1KOd0Jg)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 2 Jun 2005 19:54:35 +0000 (19:54 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 2 Jun 2005 19:54:35 +0000 (19:54 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk


Trivial merge